Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 30 Jul 2010 02:11:29 +0000 (02:11 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 30 Jul 2010 02:11:29 +0000 (02:11 +0000)
commit3eb66da95507c8adcce57a4be2f3b8dad1775b2b
tree161e393ee4058b7c3b8322cd7d7b5438f38611d5
parent64eb1ec9e964ca7fe84524e9b2dd87c2363b1dfb
parentbfea42bb5e4a34e0082674c348c7000b041e5300
Merge from mainline.